From: Fabian Gruenbichler Date: Thu, 12 Jan 2023 16:33:49 +0000 (+0000) Subject: Import rust-debcargo_2.6.0-2.debian.tar.xz X-Git-Tag: archive/raspbian/2.7.11-2+rpi1~1^2^2~1^2 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/%22mailto:kde%40ewsoftware.de//%22style.css/%22/%22http:/www.example.com/%22mailto:kde%40ewsoftware.de/%22style.css/%22?a=commitdiff_plain;h=e4036c59b29e11ff93aed5100877a6d91a0023e5;p=rust-debcargo.git Import rust-debcargo_2.6.0-2.debian.tar.xz [dgit import tarball rust-debcargo 2.6.0-2 rust-debcargo_2.6.0-2.debian.tar.xz] --- e4036c59b29e11ff93aed5100877a6d91a0023e5 diff --git a/cargo-checksum.json b/cargo-checksum.json new file mode 100644 index 0000000..b5623be --- /dev/null +++ b/cargo-checksum.json @@ -0,0 +1 @@ +{"package":"Could not get crate checksum","files":{}} diff --git a/changelog b/changelog new file mode 100644 index 0000000..19fb404 --- /dev/null +++ b/changelog @@ -0,0 +1,124 @@ +rust-debcargo (2.6.0-2) unstable; urgency=medium + + * Team upload. + * Rebuild debcargo 2.6.0 with cargo 0.66.0 + + -- Fabian Gruenbichler Thu, 12 Jan 2023 16:33:49 +0000 + +rust-debcargo (2.6.0-1) unstable; urgency=medium + + * Team upload. + * Package debcargo 2.6.0 from crates.io using debcargo 2.5.0 + + -- Fabian Gruenbichler Wed, 16 Nov 2022 10:08:41 +0100 + +rust-debcargo (2.5.0-5) unstable; urgency=medium + + * Team upload. + * Package debcargo 2.5.0 from crates.io using debcargo 2.5.0 + * Bump textwrap dependency. + + -- Peter Michael Green Sun, 30 Oct 2022 16:37:02 +0000 + +rust-debcargo (2.5.0-4) unstable; urgency=medium + + * Team upload. + * Package debcargo 2.5.0 from crates.io using debcargo 2.5.0 + * Bump git2 dependency. + + -- Peter Michael Green Sat, 08 Oct 2022 04:27:58 +0000 + +rust-debcargo (2.5.0-3) unstable; urgency=medium + + * Team upload. + * Package debcargo 2.5.0 from crates.io using debcargo 2.5.0 + * Update dependencies for new textwrap version in Debian. + + -- Peter Michael Green Mon, 14 Mar 2022 01:24:43 +0000 + +rust-debcargo (2.5.0-2) unstable; urgency=medium + + * Team upload. + * Package debcargo 2.5.0 from crates.io using debcargo 2.5.0 + * Don't run the build-time tests on mips64el as they fail to link. + + -- Peter Michael Green Mon, 29 Nov 2021 11:57:39 +0000 + +rust-debcargo (2.5.0-1) unstable; urgency=medium + + * Package debcargo 2.5.0 from crates.io using debcargo 2.5.0 + + -- Ximin Luo Thu, 11 Nov 2021 13:35:58 +0000 + +rust-debcargo (2.4.4-1) unstable; urgency=medium + + * Team upload. + * Package debcargo 2.4.4 from crates.io using debcargo 2.4.3 + * Adjust dependencies for versions currently in sid. + * Revert cargo 0.49 related changes until rust-cargo is + updated in Debian. + + -- Peter Michael Green Sat, 06 Feb 2021 18:12:33 +0000 + +rust-debcargo (2.4.3-3) unstable; urgency=medium + + * Team upload. + * Package debcargo 2.4.3 from crates.io using debcargo 2.4.3 + * Bump dependency on git2 package, the old version is broken + with new libgit2 (Closes: 976658). + + -- Peter Michael Green Mon, 07 Dec 2020 05:21:57 +0000 + +rust-debcargo (2.4.3-2) unstable; urgency=medium + + * Team upload. + * Package debcargo 2.4.3 from crates.io using debcargo 2.4.2 + * Relax dependency on itertools + + -- Peter Michael Green Tue, 01 Sep 2020 13:47:42 +0000 + +rust-debcargo (2.4.3-1) unstable; urgency=medium + + * Package debcargo 2.4.3 from crates.io using debcargo 2.4.2 + + -- Ximin Luo Sat, 18 Apr 2020 20:52:06 +0100 + +rust-debcargo (2.4.2-1) unstable; urgency=medium + + * Package debcargo 2.4.2 from crates.io using debcargo 2.4.2 + + -- Ximin Luo Wed, 08 Jan 2020 21:54:13 +0000 + +rust-debcargo (2.4.1-1) unstable; urgency=medium + + * Package debcargo 2.4.1 from crates.io using debcargo 2.4.1 + * Closes: #945436, #945499, #945560, #947088. + + -- Ximin Luo Fri, 03 Jan 2020 01:19:34 +0000 + +rust-debcargo (2.4.0-1) unstable; urgency=medium + + * Package debcargo 2.4.0 from crates.io using debcargo 2.4.0 + (Closes: #931897) + + -- Ximin Luo Thu, 15 Aug 2019 19:07:57 -0700 + +rust-debcargo (2.2.10-1) unstable; urgency=medium + + * Package debcargo 2.2.10 from crates.io using debcargo 2.2.10 + + -- Ximin Luo Sun, 20 Jan 2019 23:25:15 -0800 + +rust-debcargo (2.2.9-2) unstable; urgency=medium + + * Package debcargo 2.2.9 from crates.io using debcargo 2.2.9 + * Add dependency on quilt. + * Install debcargo.toml.example as an example. + + -- Ximin Luo Thu, 29 Nov 2018 22:33:36 -0800 + +rust-debcargo (2.2.9-1) unstable; urgency=medium + + * Package debcargo 2.2.9 from crates.io using debcargo 2.2.9 + + -- Ximin Luo Wed, 14 Nov 2018 21:03:02 -0800 diff --git a/compat b/compat new file mode 100644 index 0000000..48082f7 --- /dev/null +++ b/compat @@ -0,0 +1 @@ +12 diff --git a/control b/control new file mode 100644 index 0000000..75f5550 --- /dev/null +++ b/control @@ -0,0 +1,103 @@ +Source: rust-debcargo +Section: rust +Priority: optional +Build-Depends: debhelper (>= 12), + dh-cargo (>= 25), + cargo:native, + rustc:native, + libstd-rust-dev, + librust-ansi-term-0.12+default-dev, + librust-anyhow-1+default-dev, + librust-cargo-0.66+default-dev, + librust-chrono-0.4+default-dev, + librust-clap-3+cargo-dev, + librust-clap-3+default-dev, + librust-clap-3+derive-dev, + librust-env-logger-0.9+default-dev, + librust-filetime-0.2+default-dev, + librust-flate2-1+default-dev, + librust-git2-0.16+default-dev, + librust-glob-0.3+default-dev, + librust-itertools-0.10+default-dev, + librust-log-0.4+default-dev, + librust-regex-1+default-dev, + librust-semver-1+default-dev, + librust-serde-1+default-dev, + librust-serde-derive-1+default-dev, + librust-tar-0.4+default-dev, + librust-tempfile-3+default-dev, + librust-textwrap-0.16+default-dev, + librust-toml-0.5+default-dev, + librust-walkdir-2+default-dev, + rustc:native (>= 1.29) +Maintainer: Debian Rust Maintainers +Uploaders: + Ximin Luo +Standards-Version: 4.6.1 +Vcs-Git: https://salsa.debian.org/rust-team/debcargo-conf.git [src/debcargo] +Vcs-Browser: https://salsa.debian.org/rust-team/debcargo-conf/tree/master/src/debcargo +X-Cargo-Crate: debcargo +Rules-Requires-Root: no + +Package: librust-debcargo-dev +Architecture: any +Multi-Arch: same +Depends: + ${misc:Depends}, + librust-ansi-term-0.12+default-dev, + librust-anyhow-1+default-dev, + librust-cargo-0.66+default-dev, + librust-chrono-0.4+default-dev, + librust-clap-3+cargo-dev, + librust-clap-3+default-dev, + librust-clap-3+derive-dev, + librust-env-logger-0.9+default-dev, + librust-filetime-0.2+default-dev, + librust-flate2-1+default-dev, + librust-git2-0.16+default-dev, + librust-glob-0.3+default-dev, + librust-itertools-0.10+default-dev, + librust-log-0.4+default-dev, + librust-regex-1+default-dev, + librust-semver-1+default-dev, + librust-serde-1+default-dev, + librust-serde-derive-1+default-dev, + librust-tar-0.4+default-dev, + librust-tempfile-3+default-dev, + librust-textwrap-0.16+default-dev, + librust-toml-0.5+default-dev, + librust-walkdir-2+default-dev +Provides: + librust-debcargo+default-dev (= ${binary:Version}), + librust-debcargo-2-dev (= ${binary:Version}), + librust-debcargo-2+default-dev (= ${binary:Version}), + librust-debcargo-2.6-dev (= ${binary:Version}), + librust-debcargo-2.6+default-dev (= ${binary:Version}), + librust-debcargo-2.6.0-dev (= ${binary:Version}), + librust-debcargo-2.6.0+default-dev (= ${binary:Version}) +Description: Create a Debian package from a Cargo crate - Rust source code + This package contains the source for the Rust debcargo crate, packaged by + debcargo for use with cargo and dh-cargo. + +Package: debcargo +Architecture: any +Multi-Arch: allowed +Section: devel +Depends: + ${misc:Depends}, + ${shlibs:Depends}, + ${cargo:Depends}, + quilt +Recommends: + ${cargo:Recommends}, + dh-cargo +Suggests: + ${cargo:Suggests} +Provides: + ${cargo:Provides} +Built-Using: ${cargo:Built-Using} +XB-X-Cargo-Built-Using: ${cargo:X-Cargo-Built-Using} +Description: Create a Debian package from a Cargo crate + This package contains the following binaries built from the Rust crate + "debcargo": + - debcargo diff --git a/copyright b/copyright new file mode 100644 index 0000000..f395ab3 --- /dev/null +++ b/copyright @@ -0,0 +1,43 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: debcargo +Upstream-Contact: + Josh Triplett + Ximin Luo + Vasudev Kamath +Source: https://salsa.debian.org/rust-team/debcargo + +Files: * +Copyright: + 2016 Josh Triplett + 2017-2018 Ximin Luo + 2017-2018 Vasudev Kamath +License: MIT or Apache-2.0 + +Files: debian/* +Copyright: + 2018-2021 Debian Rust Maintainers + 2018 Ximin Luo +License: MIT or Apache-2.0 + +License: Apache-2.0 + Debian systems provide the Apache 2.0 license in + /usr/share/common-licenses/Apache-2.0 + +License: MIT + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + . + The above copyright notice and this permission notice shall be included in all + copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE. diff --git a/copyright.debcargo.hint b/copyright.debcargo.hint new file mode 100644 index 0000000..3e91002 --- /dev/null +++ b/copyright.debcargo.hint @@ -0,0 +1,55 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: debcargo +Upstream-Contact: + Josh Triplett + Ximin Luo + Vasudev Kamath +Source: https://salsa.debian.org/rust-team/debcargo + +Files: * +Copyright: + FIXME (overlay) UNKNOWN-YEARS Josh Triplett + FIXME (overlay) UNKNOWN-YEARS Ximin Luo + FIXME (overlay) UNKNOWN-YEARS Vasudev Kamath +License: MIT or Apache-2.0 +Comment: + FIXME (overlay): Since upstream copyright years are not available in + Cargo.toml, they were extracted from the upstream Git repository. This may not + be correct information so you should review and fix this before uploading to + the archive. + +Files: src/debian/licenses/AGPL-3.0 +Copyright: 2007 Free Software Foundation, Inc. +License: UNKNOWN-LICENSE; FIXME (overlay) +Comment: + FIXME (overlay): These notices are extracted from files. Please review them + before uploading to the archive. + +Files: debian/* +Copyright: + 2018-2023 Debian Rust Maintainers + 2018-2023 Ximin Luo +License: MIT or Apache-2.0 + +License: Apache-2.0 + Debian systems provide the Apache 2.0 license in + /usr/share/common-licenses/Apache-2.0 + +License: MIT + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + . + The above copyright notice and this permission notice shall be included in all + copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE. diff --git a/debcargo.examples b/debcargo.examples new file mode 100644 index 0000000..2bf9da9 --- /dev/null +++ b/debcargo.examples @@ -0,0 +1 @@ +debcargo.toml.example diff --git a/debcargo.toml b/debcargo.toml new file mode 100644 index 0000000..333fd75 --- /dev/null +++ b/debcargo.toml @@ -0,0 +1,10 @@ +overlay = "." +uploaders = ["Ximin Luo "] + +[source] +build_depends = ["rustc:native (>= 1.29)"] + +[packages.bin] +section = "devel" +depends = ["quilt"] +recommends = ["dh-cargo"] diff --git a/patches/series b/patches/series new file mode 100644 index 0000000..39bca29 --- /dev/null +++ b/patches/series @@ -0,0 +1 @@ +update-cargo.patch diff --git a/patches/update-cargo.patch b/patches/update-cargo.patch new file mode 100644 index 0000000..2f69e91 --- /dev/null +++ b/patches/update-cargo.patch @@ -0,0 +1,44 @@ +Index: debcargo/Cargo.toml +=================================================================== +--- debcargo.orig/Cargo.toml ++++ debcargo/Cargo.toml +@@ -31,7 +31,7 @@ version = "0.12" + version = "1.0" + + [dependencies.cargo] +-version = "0.63" ++version = "0.66" + + [dependencies.chrono] + version = "0.4" +@@ -53,7 +53,7 @@ version = "0.2" + version = "1" + + [dependencies.git2] +-version = "0.14" ++version = "0.16" + + [dependencies.glob] + version = "0.3" +diff --git a/src/crates.rs b/src/crates.rs +index c57a61f..e5dc842 100644 +--- a/src/crates.rs ++++ b/src/crates.rs +@@ -60,7 +60,7 @@ fn hash(hashable: &H) -> u64 { + } + + fn fetch_candidates(registry: &mut PackageRegistry, dep: &Dependency) -> Result> { +- let mut summaries = match registry.query_vec(dep, false) { ++ let mut summaries = match registry.query_vec(dep, cargo::core::QueryKind::Exact) { + std::task::Poll::Ready(res) => res?, + std::task::Poll::Pending => { + registry.block_until_ready()?; +@@ -125,7 +125,7 @@ impl CrateInfo { + let dep = Dependency::parse(crate_name, None, source_id)?; + let mut package_id: Option = None; + loop { +- match source.query(&dep, &mut |p| package_id = Some(p.package_id())) { ++ match source.query(&dep, cargo::core::QueryKind::Exact, &mut |p| package_id = Some(p.package_id())) { + std::task::Poll::Ready(res) => { + res?; + break; diff --git a/rules b/rules new file mode 100755 index 0000000..f7c4337 --- /dev/null +++ b/rules @@ -0,0 +1,10 @@ +#!/usr/bin/make -f +include /usr/share/dpkg/architecture.mk + +%: + dh $@ --buildsystem cargo + +override_dh_auto_test: +ifneq ($(DEB_HOST_ARCH),mips64el) + dh_auto_test -- test --all +endif diff --git a/rules.debcargo.hint b/rules.debcargo.hint new file mode 100755 index 0000000..92c239b --- /dev/null +++ b/rules.debcargo.hint @@ -0,0 +1,6 @@ +#!/usr/bin/make -f +%: + dh $@ --buildsystem cargo + +override_dh_auto_test: + dh_auto_test -- test --all diff --git a/source/format b/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/tests/control b/tests/control new file mode 100644 index 0000000..9b795a0 --- /dev/null +++ b/tests/control @@ -0,0 +1,14 @@ +Test-Command: /usr/share/cargo/bin/cargo-auto-test debcargo 2.6.0 --all-targets --all-features +Features: test-name=rust-debcargo:@ +Depends: dh-cargo (>= 18), @ +Restrictions: allow-stderr, skip-not-installable + +Test-Command: /usr/share/cargo/bin/cargo-auto-test debcargo 2.6.0 --all-targets +Features: test-name=librust-debcargo-dev:default +Depends: dh-cargo (>= 18), @ +Restrictions: allow-stderr, skip-not-installable + +Test-Command: /usr/share/cargo/bin/cargo-auto-test debcargo 2.6.0 --all-targets --no-default-features +Features: test-name=librust-debcargo-dev: +Depends: dh-cargo (>= 18), @ +Restrictions: allow-stderr, skip-not-installable diff --git a/watch b/watch new file mode 100644 index 0000000..f8920cd --- /dev/null +++ b/watch @@ -0,0 +1,4 @@ +version=4 +opts=filenamemangle=s/.*\/(.*)\/download/debcargo-$1\.tar\.gz/g,\ +uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/ \ +https://qa.debian.org/cgi-bin/fakeupstream.cgi?upstream=crates.io/debcargo .*/crates/debcargo/@ANY_VERSION@/download